Merge "Fix transparent color" into mnc-ub-dev