Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev