Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev