Merge cherrypicks of [8059010, 8059027, 8059344, 8059225, 8059029, 8058795, 8059012] into qt-release

Change-Id: I020700e8fed9ee66a3a01f5e7910fcc06f351577