Navbar: Lollipop icons option extended to support previous larger style
Conflicts:
	res/values/arrays.xml
	res/xml/gravitybox.xml
	src/com/ceco/gm2/gravitybox/GravityBoxSettings.java
	src/com/ceco/gm2/gravitybox/ModNavigationBar.java
	src/com/ceco/gm2/gravitybox/pie/PieController.java