Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev