Merge "Align file sharing UI with mocks." into udc-dev