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

Change-Id: I5a887f3f5f7041eaddf2c3a1812f20215c0d648e