Merge "Fix NPEs for virtual displays" into sc-dev