Merge "Merge "Set mNextServedView as null only when current served view lost...
Merge "Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev am: 62748d0a am: 25bc08c7" into rvc-d1-dev-plus-aosp am: eacd7657 am: 4c2f7fca
Change-Id: I3a0a98cf551889b21ea6a8355067c3e15217e639