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

Change-Id: Id639f01a3969851294bfcd6746b84bac579da0f7