Merge cherrypicks of [11161370, 11131606, 11161395, 11161891] into qt-d4-release

Change-Id: I7491e6e224c4abc2e3504eb54fff988aa70cdb51