Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev