Merge "Don't limit RetailDemoModeService to start only during demo mode."