Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev