Merge "Cross fade wake-up from pulsing" into pi-dev