Move QS and Navbar to General

Conflicts:
	res/xml/general_settings.xml
	res/xml/screen_and_animations.xml