Merge "Fix incorrect calculation of activity snapshot ID" into main

            final ArrayList<ActivityRecord> mCloseActivities = new ArrayList<>();

            void add(ActivityRecord ar) {

                if (ar.isVisibleRequested()) {

                    mOpenActivities.add(ar);

                } else {

                    mCloseActivities.add(ar);

                final ArrayList<ActivityRecord> targetList = ar.isVisibleRequested()

                        ? mOpenActivities : mCloseActivities;

                if (!targetList.contains(ar)) {

                    targetList.add(ar);

                }

            }