Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c
Add instance save/restore for hardware tunables.

Needed to correctly handle e.g. screen rotation.

Change-Id: I6c4ba9aa24c9545037f949a68654428457de46f5