Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev