Merge cherrypicks of [6298554, 6298593, 6297763, 6297764] into qt-release

Change-Id: Iac52907ba38101780e5ff4f926f9c7460564001f