Merge "Fix issue with quick switch animation not running."