Merge cherrypicks of [10484934, 10484473, 10472987, 10481068] into qt-qpr2-release

Change-Id: I3ba00e16f09289a9368e55b59b0a527bc55bb3f3