Merge cherrypicks of [8709890, 8710035, 8710036, 8710037, 8710038, 8709945, 8709612] into qt-release

Change-Id: I7562106135f6c9d72c2c15a3c60157903ca9e3d1