Merge "Apply display override config for secondary displays"