Merge cherrypicks of [5543400, 5543343, 5543344] into qt-release

Change-Id: I233f117ea38b776f6ee709be9fd8ce3469aed337