Merge cherrypicks of [9213234, 9204894, 9213209, 9213210, 9213211, 9213235, 9213236, 9213697] into qt-c2f2-release

Change-Id: I1820b11e3dfc4d5a8043faf33138383a9695120c