Merge cherrypicks of [9739536, 9739043, 9739695, 9739046, 9739505, 9739506, 9739507, 9739047, 9739615] into qt-qpr1-release

Change-Id: I478e10c5761ff7755ba62770f0354ed5f04c1ba8