Merge "b/5045933 Highlight the current day/time when Today button is pressed"