Merge cherrypicks of [9111407, 9111408, 9111409, 9111410, 9111411, 9111332, 9110454] into qt-release

Change-Id: Ic9723493034182084113fcdb716988d4329c7037