Merge "Fixed how ContentCapture checks for system apps."