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