Merge "Revert "Added app context to smart screen brightness.""