Merge "Fix memory leak in ApnSettings-activity"