am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev

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