am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev

* commit 'f12c91f5e67171bae0d36e89a507c96ff81d04a2':
  Remember focused child during layout when adapter has stable IDs