Merge "Add elevation settings to cardview demo app" into lmp-dev