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

                // We can remember the focused view to restore after re-layout

                // if the data hasn't changed, or if the focused position is a

                // header or footer.

                if (!dataChanged || isDirectChildHeaderOrFooter(focusedChild)) {

                if (!dataChanged || isDirectChildHeaderOrFooter(focusedChild)

                        || focusedChild.hasTransientState() || mAdapterHasStableIds) {

                    focusLayoutRestoreDirectChild = focusedChild;

                    // Remember the specific view that had focus.

                    focusLayoutRestoreView = findFocus();