Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev