Merge "Add `enable_bug_fixes_for_secondary_display` flag." into main