xda-one: lots more changes for API 21 (Lollipop) with backward compat