Merge "Merge "Conserve activity flag after notif update" into rvc-dev am: 0d8689233d am: 93cf1840ab am: 9236a95aa6" into rvc-qpr-dev-plus-aosp