Merge in @WickyNilliams code to detect a change to props without affecting HSV values