Merge cherrypicks of [8689551, 8689566, 8689567, 8690716] into qt-release

Change-Id: If76d9d6d021e63f0d45d1d0d7f444b830a8ca76a