Merge cherrypicks of [5656230, 5656231, 5656232, 5656233, 5656423, 5656424] into qt-release

Change-Id: I316479e6f8912721061dacfef8617e68f010743d