Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev