Merge cherrypicks of [9007561, 9007562, 9007563, 9007600, 9007801, 9007895, 9007389] into qt-release

Change-Id: I0967e5879ce7dbaaefe69e18f7841a2f75b3e64a