Merge "Add "developer tools" preferences section"