Merge cherrypicks of [9131405, 9130772, 9131110, 9131093, 9131019, 9131394, 9131395, 9131396, 9131406, 9131480, 9131397] into qt-c2f2-release

Change-Id: I14da7302e79e5a10673b8faed18864fbcc8cd0ad