Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am: 7a719ab0ed

Change-Id: I145e868610a92ba1af501c62b151c7f55663bec3