Merge "Prevent degenerate 9-patches from drawing out of bounds Bug #7137292" into jb-mr1-dev