Merge "Support caption second UI structure (1/n)"