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