Merge "Settings: Remove HAL HDR+ option"