Merge "Avoid the caption bar overlaps with status bar" into main