Merge "Reverse the iteration order for focus check." into main