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

Change-Id: I9be585defa39916e009d758014019008c0f8e157