Merge cherrypicks of [11039218, 11037162, 11039276, 11039311, 11039294] into qt-qpr3-release

Change-Id: Ia118d207c1bea8d8d33568c7de2f3296995077a9