Merge "MAP: Don't start/stop on broadcast intent" into pi-dev