Merge cherrypicks of [9434351, 9434801, 9434688, 9434802, 9434034, 9434035, 9434608, 9434036] into qt-c2f2-release

Change-Id: Id08e5084d86caf4c13633f9b04bc3d217ad7f3f5