Merge "Update ApiDemos control samples for Material"