Merge cherrypicks of [5503807, 5503110, 5503120] into qt-release

Change-Id: I29e5023812d71671db8490a5121af1234c79b600