Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev