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

Change-Id: I76b1d252cd8424f5a8904d32071b0a5630a6a262