Merge "Fix focus issues on animated items."