Merge "Fix permissions check to show "hide" buttons."