Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev