Merge "Fix NPE if display is off and then removed" into sc-dev