Merge "Revert "Implement base version of GrantPermissions dialog"" into cw-e-dev