Merge cherrypicks of [9500481, 9500482, 9500499, 9500334, 9500335, 9500400, 9500401, 9500402, 9500403, 9500608, 9500558, 9500559, 9500560, 9500561] into qt-qpr1-release

Change-Id: Ibe7a8e604a49732308a8abb87783258a96b42d57