Includes Demo features and new features used in UnitTesting. See
MainActivity to enable/disable Demo