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

* commit '13eaaea8771fc1ed55fde023e622ddc45c59656d':
  Fixed that volume buttons were not working on the pin input

Change-Id: I2361392d72d01413abfd7859e2a70d93cdff662a