Merge "Stop timer when notification isn't visible" into qt-dev am: 7256c379df
am: 8594033be0

Change-Id: I45e044aa055ac945377a578f325850e00772d4e3