Re-order toolbar settings

Now in a more logical order

Change-Id: Ieabf06e4d46fc8358e19eb7ad9ea0f7a0ee3bca5
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Fix hardware keys mess (2/2)

Squashed commits from CM

Updates Hardware keys settings

Adds ability to answer call with hardware HOME button (preparation to winter time)

Change-Id: I0d22a6fbb92a61f08b50cae5c14d0030b81ee6ec

Change-Id: If77ee56defce6e4f796520d4f3b3a0f251bcf194