Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev