Merge "Temporarily remove change for delaying dismissing existing archive leave behind views." into jb-ub-mail-ur8