Merge "Show gear for apps that provide general settings intent" into nyc-dev