Merge "Fix Developer options page memory leak"