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

Change-Id: I3dede8bd8e1691857d5f894247621fd807f98ce3