Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c
am: 01c59fc091

* commit '01c59fc091819d982f821ebc1d347b2821a13c41':
  Fixed that volume buttons were not working on the pin input

Change-Id: I336e32276d219fe0205a934de4533dba1d5cba2d