Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev