xda-one: a lot more API 21 changes (with backporting)

* also cleanup a bunch