Merge "Do not dismiss notification, flip activity flag" into rvc-dev