Merge "Expanding folder rename touch region"