Merge cherrypicks of [11361055, 11362850, 11362385, 11362386, 11362870] into qt-d4-release

Change-Id: Id82c4248872f7ef7cd665398585b12c1071bba13