Merge cherrypicks of [7003810, 7004390, 7003811] into qt-release

Change-Id: Iafc2708a2a511a893d1389340c54ccb3e97cb375