Merge "Add xxhdpi drawables" into klp-dev