Merge "Only override embedded activity locale if source package lookup yields locales to match" into udc-dev