Merge "Removed call to isOnlyCoreApps()"