Push a few more admin Ui changes
Merge remote-tracking branch 'origin/master' into UIWorkSD
Change the main view model to update the security mode to none.