Merge "Fixed an issue where icons were jumping" into oc-dr1-dev