Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev