Merge cherrypicks of [6831382, 6831345, 6829733] into qt-release

Change-Id: I91936b673e1a8932c32a92a0d47105f8740e14bb