Merge "Merge "CtsLeanbackJank: fix focus and pre-scroll delay." into pie-cts-dev am: 18c6306249"