Merge "[Title] remove the code setting the portrait mode when folder is renamed....