Merge "Refactor ReviewPermissionsActivity" into tm-dev