Merge "Fix parsing of old-style intent URIs" into lmp-dev