Merge "Fix checkbox animation end colors" into mnc-dev