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

Change-Id: If05fcacca0e9aa7f70546a317ca332bf4c92b2dc