Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev am: 12ee4bd7a8
am: c0ff11a4c5

Change-Id: I5ededc798b40b3c4c5279bb253a885199c31a440