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
Change-Id: I0db46775910d8c95d0453dba09f46c7a29616aea