Merge cherrypicks of [11834993, 11835120, 11834645, 11834934, 11834935, 11834936, 11834646, 11834647, 11834648, 11834649, 11834650, 11834651, 11834652, 11834653, 11834970, 11834857, 11835121, 11835122, 11835158] into qt-d4-release

Change-Id: I301d28639697b93e8e61555a1fe0228d25b9e5aa