Revert "Settings: Don't crash if we pause too quickly"

This reverts commit 58e8049e1ca6889cd4e9f0b00aec83d59f18afed.

Change-Id: Ibd07c77c10eb98e9c1d2dc09a8fb0841bdc1caa6
Fix custom device display settings

*for bacon

Change-Id: Id1fa7da48d58924bb7a661dad2834ac98241b36e
Revert "Fix custom device display settings"

This reverts commit 66002f3df86342f5fed36f717c6177adccecc629.

Change-Id: I6fead4dc520516ca4961732b864462a9dbfafb6b
Merge pull request #2 from LiquidSmooth/kitkat3

source is uptodate