Merge "Allow override the suppress Overlay condition" into main