Merge "Revert^2 "Handling intent whose nested intent keys not collected case"" into main