Merge "Only register key listener when resumed." into mnc-ub-dev