Merge cherrypicks of [6098834, 6098835, 6098836, 6099785] into qt-release

Change-Id: I92438d4317800ce789800bf0339d90eb692fc95d