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