Merge "Set wakeup light reveal duration to 667ms to match spec"