Merge "Left align toolbar popup when larger than viewport" into main