Merge "Add config flag to disable transition animation."