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