Merge cherrypicks of [10728921, 10728922, 10731959, 10731310, 10731384, 10728923, 10728924, 10732051] into qt-d4-release

Change-Id: I81f34bbc265248b208024149ab52da8e386bb754