Merge "Merge "Fix the icon pixels should be counted in." into oreo-mr1-cts-dev am: e8016b3b79" into pie-cts-dev