Merge "Fix Grant Permission Dialog numbering" into udc-mainline-prod