Merge "Status bar icon ordering" into pi-dev