Merge cherrypicks of [10961387, 10961388, 10961389, 10962537, 10961893, 10961547, 10961390, 10964051, 10964032] into qt-d4-release

Change-Id: Icb970224fba3b98a4d6a4d33bb0ef1114326e7df