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

Change-Id: Id8399a6fed722da7057c21e23981bc6925d72e7d