Squash updates from OmniROM

- bugfixes and improvements
- simplify and cleanup
- global whitespace cleanup
- improve position settings overlay

Credit - @maxwen and OmniROM

Change-Id: I3227f6df22300e9d6745590ecc66476a2c615942