Merge "Add user pref to retain PatchScreen Header when changing files"