Merge "Only track focused next served view in onViewFocusChanged" into rvc-dev am: 37b8baa3 am: 00dde964 Change-Id: I91c7cbbee4282460de1c889121d8657e89905622