Merge "ActiveModeManager: add dump calls" into pi-dev