Merge "Ignore virtual displays and screen off on flicker"