Merge cherrypicks of [6161613, 6161614, 6161769] into qt-release

Change-Id: Idde262274cd6282c6999c1804db17da1077a89b0