Merge "UserInfo.isDemo() to also check UserInfo.FLAG_DEMO"