Merge cherrypicks of [7829120, 7828455, 7828457, 7829139] into qt-qpr1-release

Change-Id: I11d65f4802ced2a39f6aac8d6c24280e61f51719