Merge "Set caption bar height to status bar height when in fullscreen" into main