Merge "Added new overlay property config_enableMainUserPermanentAdmin"