Merge "Fix build - move system shortcut icon colors to theme" into ub-launcher3-master