Merge "Prevent unhandled exception in NinePatchDrawable"