Merge "Remove unnecessary Rect, better reuse of NinePatch objects"