Merge "MediaClock: add timer"