Merge "Don't double prompt on booting encrypted device"