Merge "Close button on folder namer, with single line look." into honeycomb