Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev