Merge "Use non deprecated method for creating ColorStateList" into mnc-dev