Merge "Update Grant Permissions dialog to redlines" into cw-e-dev