Merge "Add activity manager command to watch uid state changes."