Merge "Add enable/disable permission to permissioncontroller" into rvc-dev