Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev