Merge "Revert "Remove data retry intent"" into main