Merge "Fix privacy chip overlapping with statusbar icons" into udc-qpr-dev