Merge cherrypicks of [9530040, 9530338, 9530339, 9530041, 9530042, 9530043, 9530784, 9530785, 9530786] into qt-qpr1-release

Change-Id: I728e5dee99267e84d5683f0b4522af0cd6e36988