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

* commit '5df763e1777e0a4e5fcc0bd399029cd03d8a2bc4':
  Fixed that volume buttons were not working on the pin input

Change-Id: I2a53d1203e1037ce957cf051c67d3cd1630ce199