Merge "Refactor permission checks removeActiveAdmin" into sc-v2-dev