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