Merge "Fixed focus recovery when adapter changes during scrolling"