Merge "Keep automatic screen brightness monotonically increasing until screen is turned off."