Merge "[bbq] always update size if scaling mode changes to non freeze" into udc-dev