Pull back to garwynn to keep in sync

This has some confirmed fixes, such as wakelocks, that should improve usability.