Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0