Merge "Update some app permission icons" into pi-dev