Merge "Remove attribute colorError from settings glif theme"