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

Change-Id: I88ee4177303737d1622ba9b326610418c7269a58