Merge cherrypicks of [7773044, 7773106, 7772815, 7772993, 7772994, 7772995] into qt-qpr1-release

Change-Id: I86eefc3883badc1145a33911280bb80b732bfab0