Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev