Revert "Squash sidebar commits from ChaOS"

This reverts commit 48cdc334a72fd18eb4862a1fd35959d39fdaa935.

Conflicts:

	res/values/jisoo_strings.xml