Merge cherrypicks of [9193293, 9193352, 9193734, 9193641, 9192591, 9193630] into qt-release

Change-Id: I34f06d8277b5d051cbe3f67a8c8512dbbe297a39