Merge \\"Update listener for animation in Gesture Settings.\\" into nyc-mr1-dev am: b63679157b
am: e65dc0d20e

Change-Id: I4134323420a89305415561c96ea87abb1cdc812f