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

Change-Id: Ie97446b64f694f9abb2092ab8c98f6f41b38b9a4