Fix display issue after moving folder in Folder Manager (#1489293)

Conflicts:

	CHANGELOG