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