Merge "Preserve left+right compound drawables" into nyc-mr1-dev