DataGrid and AdvancedDataGrid doesn't remember the cell position when a column is sorted and used tab key to focusin

Steps to reproduce:
1. Run DataGridTest.mxml
2. Click Test2-2 cell to select.
3. Click "editable true 1" header to sort
After the sort, Test2-2 is moved to 12th from the top, and Test2-2 is still selected.
4. Click the TextInput which is located above ADG.
5. Hit tab key once then the focus is in ADG now.

Actual Results:
Test2-10 is selected instead of Test2-2.

Expected Results:
Test2-2 should be selected to edit.

Workaround (if any):