Merge "Remove unnecessary animation" into rvc-dev am: a66d82a6d1

Change-Id: Id8e8a7cff4f98dd23e855c8adfc3fe96a2b6d819