Merged all stuff from android 4.4