am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved...
am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit '0f1a3972':
Stash modulation alpha until ColorStateList has resolved base color