Merge "Fix user color overlay is not applied"