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

Change-Id: I5283450d1273f7063eb6e2550006449835cc5814