Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into qt-qpr2-release

Change-Id: I9a02cca7de11383edc3910c29bc414ce1152971c