Merge "Handle when archiving icon flag is turned off by setting overlay back on" into main