Merge "Changing user switching messages for demo mode" into nyc-mr1-dev