Merge "Add executor to onUpdateUserSensitiveFlags" into rvc-dev