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

Change-Id: I46212487711efebe8efa95bfa28f24e8ee24a2cf