Merge "Revert "Stop timer when notification isn't visible"" into qt-dev
am: 628f975c22

Change-Id: If351a368f5a1132e61dab1e7a1b1d5e290b092f7