Camera button support (2/2)

Change-Id: Iec4106effd25894644f586a9ca6ffba4c00f72ba