Merge "Update caption colors in relayout()" into main