Merge "Refactor permission checks removeActiveAdmin"