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