Merge "Don't trigger lift-to-wake on wireless charger"