Edgeclient for Android

Hi, I've run into a strange issue. When I first setup an edgeclient, I had enforce device lock turned on for Android Edgeclient. So when I connected with the Android tablet (Nexus 7), it forced me to specify a pin. Subsequently, I decided I didn't like having to enter the pin every time I want to use my android tablet so I tried to remove that setting under security, but it won't let me. It's set to 'disabled by administrator, encryption policy or credential storage'.

I went to the bigIP and removed the requirement for the Device lock, but subsequent connections through the edgeclient aren't downloading this new setting. I also tried to uninstall EdgeClient from my tablet but it says it needs to be deactivated first (guessing through the Edgeclient profile on the server side), but I see no way of doing this on the tablet nor on the BigIP Edgeclient profile side. Basically, I'm completely stuck with this Device Lock feature. Any ideas on how to resolve this?