Merge "Fix for unresponsive color picker collection" into udc-dev