Merge "Don't show disabled apps in ignore optimizations" into mnc-dev