Refactor drawer thread
Merge branch 'upstream'
build
various
Merge branch 'upstream'