Merge "Isolate app profile directory"