Merge "Removing hacks to delay app animations until window animations complete."