Merge "Revert "Fixed poor behavior of position-based focus order""