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

Change-Id: Ieb0607ff1abf36ca56565b49aeb2f565a115bc55