Merge "Don't animate layout changes for WorkModeSwitch." into udc-qpr-dev