Merge "Set preview visible only when animation complete" into main