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

Change-Id: Ie355dc27517fd8623204a1269aea16f5089d14fb