cherrypick some bagyusz changes

I'm keeping this repo close to the official one, so no custom healthd
and other stuff.