Merge "Tapping on a timer notification takes you to the correct timer." into ub-deskclock-gatling