Merge "MoveAnimationTests: layout window as wrap_content" into main