Merge "Restore A11y and keyboard focus positions after GridView layout"