Merge "Face Virtual HAL lockout support" into main