Merge "Revert "Stop timer when notification isn't visible"" into qt-dev