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

Change-Id: Ibad2acd0ac38dbf781e9563a713a8169dce4196b