Merge "Avoid changing internal state of shared drawable" into mnc-dev