Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."