Merge "Fix the visibility for disabled apps in settings" into nyc-mr1-dev