Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev