Merge "Add activity manager command to watch uid state changes." into oc-mr1-dev