Merge "Fix potential exception while pressing volume up and volume down"