> 3e88df8 add option for enable On-Screen Buttons -- pick fix

Change-Id: I496bc882ac44667e3906864ca310aa7dd081583f
build fixes

Change-Id: I702fc16f77ec4814d1be54e2f2f73fa029a5956f