Merge "Merge "Merge "Stop timer when notification isn't visible" into qt-dev am: 7256c379 am: 8594033b" into qt-r1-dev-plus-aosp am: 302f96fe" into qt-qpr1-dev-plus-aosp