Merge cherrypicks of [7848027, 7846805, 7847697, 7847517] into qt-c2f2-release

Change-Id: Ic0223aded1eea98f0b868ec4b2c011a8d40e67fa