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

Change-Id: Ib68db973c7a9b5875ecd65bcb683793978020065