Merge "Revert "Add bootcontrol HAL APEX"" into main