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

Change-Id: If852247cde0592bc3b4223b59b650c4dd5c9b9ba