Merge commit '5bcd4380b4d4a322895c39685df1c88e342f6ded' * commit '5bcd4380b4d4a322895c39685df1c88e342f6ded': When phone is ringing, power button should hang up phone in addition to turning off the screen.