Merge "Get display size from DisplayController instance" into main