Revert "Squash sidebar commits from ChaOS"

This reverts commit 582e68e9aa26dd53e9f932233bf81b98e8164b89.

Conflicts:
	res/xml/liquid_interface_settings.xml