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

Change-Id: I9c15c06f26201d6aae98b491610ea94fe01d3bc9