Merge "[DO NOT MERGE] Suppress fill and save dialog for activities that have credman field." into udc-dev