Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev