Merge "Fix right-most navbar icon tinting mismatch" into pi-dev