Merge "Don't prompt at boot if we already did that when decrypting"