Merge cherrypicks of [7773043, 7773102, 7772814, 7772986, 7772988, 7772990] into qt-release

Change-Id: I4d2c12d0471f6f8db5f3df28ffead91777d6a871