Merge "Only set task surface background in freeform" into udc-car-dev