Merge cherrypicks of [9544810, 9544811, 9544812, 9544813, 9546204, 9546205, 9546206, 9546207, 9544814] into qt-qpr1-release

Change-Id: Idd2ab34c76e8cf11eb14651e922cb6708818aaa8