Revert wait for animation before updating settings

Change-Id: I634c8485f3d728d6609da4c02e002c6550c65a1c