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

Change-Id: Ifd484759598340b0351f76c8e0760cb5940b2c06