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