Merge "Accept occluded closing non-embedded change for embedded transition" into udc-dev