Merge "Update file+share to align toggled text with mock." into udc-dev