Merge "Non-functionally simplify getRoutingSession() and fix nullability" into main