Merge "Reduce jank when revoking notification permission" into udc-dev