Merged beginnings of android 4.3