Merge "Fix user interaction logging for both fill dialog and save ui." into udc-dev