Folder : Show folder name in exanded view w/ hide icon labels set

Show the folder name in the expanded folder view, when hide icon labels is set
to allow user to edit the folder name.

Patchset 2 : Fix indenting

Change-Id: Ifd5df5a1cf29ce0de2562b494ccfccfa38fb2ac3