Merge "Fix policy issues when screen is off."