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

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