Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev