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

Change-Id: I22266d5e3cbdb2af9638cef7e4ce3a8891ce73a3