Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev