Merge "Enable not rebooting during default encryption" into lmp-dev