Optimizations

Change-Id: Ia177e7b22fcc7e2096d947c7f15bf176e1d82ebd
Add user selectable size for sidebar [1/2]

Change-Id: I24d997c5b91da049c6ad84756bc544d143e2c00a

Conflicts:
	core/java/android/provider/Settings.java