Merge "Don't reboot after default encrypting" into lmp-dev