#113 adjust focus traversal order
(cherry picked from commit 5fb92f2441f8a245bca249ac9d85f32162925f50)