Merge cherrypicks of [8894175, 8894118, 8894119, 8894120, 8891937, 8894143, 8894144] into qt-release

Change-Id: I308f140fb027a19e9e4a5f4c9d74d0eb0b6263ed