Merge cherrypicks of [10826064, 10825884, 10819786, 10819787, 10825980, 10825981, 10825982, 10819048] into qt-d4-release

Change-Id: I39207a85a436a5c9a32cd4b180770cbfcb9ac771