Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev