Merge "Cross fade wake-up from pulsing" into pi-dev am: 42e713d7a3
am: 6af28886e3

Change-Id: I5d0f8cff0718fa2537ba7c4199347b3f0275952f