Merge "Better help message for letterbox rounded corners" into 24D1-dev