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

Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54