Merge "Improving a flakey uninstall from allapps test." into udc-dev