Merge "Removed the DEFAULT_USER_ID_TO_BOOT_INTO settings property - it's not used."