Merge "Make caption bar appearance flags debuggable" into main