Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev