Merge cherrypicks of [6001396, 6001397, 6000457, 6001398] into qt-release

Change-Id: I00cac9543628d388eea9358d3d56632150e2f74d