Merge cherrypicks of [9293684, 9293745, 9293876, 9293759, 9293760, 9293761] into qt-c2f2-release

Change-Id: I19c8c7e05b56dc5bbb267375da458cb7acdd98a0