Merge "Ensure toolbar popup respects left system bars" into main