Merge cherrypicks of [10398743, 10387952, 10392169, 10392170, 10392171, 10398644] into qt-d4-release

Change-Id: I237816f420c381bab2ccf90edf1b4cf455acb1b6