[*][naviframe] merge with 69354 for fixing focus problem when popping