Merge "Refresh strong auth alarm when admin changes policy" into rvc-dev