Merge "Don't close Folder from system nav region while editing name" into main