Merge cherrypicks of [8701731, 8702515, 8702516, 8702438, 8702439, 8702517, 8702440] into qt-release

Change-Id: Ib3e830b05e994bda32c6355ae2fd89cea1a12bbf