Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
am: 9ca0e6cc86

Change-Id: I542d48564a52b2ae7dd8497cdebde19086fe53bb