Fix: 347789110 Test: manual Flag: NONE - jank fix Change-Id: Ib1409d6c856439455aa08eeb0cfbc8075a222d45