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

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