Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev