Merge "Only register key listener when resumed." into mnc-ub-dev
am: 65d4015465

* commit '65d4015465e1db3151e5191b055cb61c5847a136':
  Only register key listener when resumed.