Fix derp.
Fix tapping on clock in notifications.
Merge remote-tracking branch 'car/jb2' into franco