Merge "Use app context to avoid memory leaks"