Improvements for data handoff from AOSP

These have helped on shiny rom, and I've also added them to omnimetal with success.