Better font size control

Before - http://i.imgur.com/pngjIEe.png

After - http://i.imgur.com/PZhG20Y.png

Change-Id: Id7d348e65d1ed76ef42437738b063faee2c35698

Conflicts:

	res/values/custom_strings.xml
[3/3]Settings: Persistence Support

Build: https://gerrit.omnirom.org/#/c/2964/
Omni: https://gerrit.omnirom.org/#/c/2481/

Change-Id: I6ed84715c9064c3ca681ba84d6436870a5792197

Conflicts:

	res/values/custom_strings.xml
[2/2]Settings: Option to hide Adb notification icon

Base: https://gerrit.omnirom.org/#/c/2934/

Change-Id: I3ac5f08a077e04dade4bdeed58442043a8fb5d23

Conflicts:

	res/values/custom_strings.xml