Merge cherrypicks of [10421308, 10421309, 10421362, 10421364, 10421365, 10421534] into qt-d4-release

Change-Id: I1279d33100b06b2cf16791110cd56bbb4fea157b