Camera button support: useful features & bugfixes (2/2)

Patchset 2: fix tablet issue

Patchset 3: forgot semicolon!

Patchset 4: remove elseif entirely...

Change-Id: I1fa5e51e1c2cf7f23dcb03140d9b4331074d55a1