Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked" into oc-dev