Merge cherrypicks of [9256784, 9257496, 9256447] into qt-release

Change-Id: Id77f6486c473a0adbd2e4d13694897250051067e