Merge "Merge "Merge "Stop timer when notification is not visible" into qt-r1-dev am: f7ad427d" into qt-qpr1-dev am: a0c8c12d" into qt-qpr1-dev-plus-aosp