Merge cherrypicks of [9111140, 9111141, 9111142, 9111143, 9109055] into qt-release

Change-Id: Ic77feced411fac42d289171f3c68ef95d64b1636