Merge "Fixing text-label demo mix color bug" into devel/master