Merge "Don't use display orientation for reachability conditions" into main