Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev