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

Change-Id: Ice9e505b8aca19b891b4eab8dd5016b97e102053