Merge "Conserve activity flag after notif update" into rvc-dev