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