Merge "Only track focused next served view in onViewFocusChanged" into rvc-dev