Merge "  hal: Fix device disable/enable sequence"