Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev