Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev