Merge cherrypicks of [5993570, 5993250, 5993251, 5993524, 5992891, 5992749, 5991571, 5993525] into qt-release

Change-Id: I2740648eadc4cff99c4afc1c58159ae8c674aaff