Merge changes Ife2ffbed,I3bd8b266 into nyc-dev

* changes:
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.
tree: c5f5725e0212cf627f7ff11007815fbec5cf9bb8
  1. samples/