Merge cherrypicks of [6288381, 6286901, 6287482, 6287483, 6285589] into qt-release

Change-Id: Ie8fc9e2af57f2fa721261a059d5d16e5259bea12