Merge "Override not drawing to screen when screen is off."