Merge "Fix several bugs in SaferIntentUtils" into main