Merge "Support disabled until used apps" into mnc-dev