Merge "Pregrant non-system preloaded apps"