Merge changes from topics "merge_safer_intent", "unsafe_intent_strict_mode" into main

* changes:
  Add new unsafe intent usage strict mode violations
  Consolidate all safer intent implementation
  Simplify and fix resolveIntent implementation