Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master." into qt-qpr1-dev