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

Patchset 2: fixed duplicates

Patchset 3: fixed build errors / more dupes...

Change-Id: I233fd8fbae9076284bae8a5dcce809619faa5eb3