Merge cherrypicks of [6101029, 6097918, 6101068, 6101069, 6101070, 6101071, 6097919] into qt-release

Change-Id: I572073c39161a1d2f5a6aeca796fb3b4f9ccde61