Merge "MAP: Don't start/stop on broadcast intent"