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

Change-Id: Iceb99c57cf8adeb4ffa9fa79fbc5f8246058e2cf