Merge "Change the text color of timer in MediaController"