Merge "Update HW toggle state on boot only if enabled"