Merge cherrypicks of [6720275, 6721883, 6719318, 6721989, 6721990, 6722040, 6721884] into qt-release

Change-Id: I6a0525e27a45b453b70c042b4b1af37eba1a43f6