Merge "fix toggling off current permissions in review"