Merge "Updating folder cling text position for Crespo. (Bug: 5346951)"