Merge cherrypicks of [9276111, 9276209, 9275845, 9276210, 9276238, 9276239, 9276211, 9276212, 9276240] into qt-c2f2-release

Change-Id: If7e884bae89b72b692824731251c818c3ebec8a0