Merge "Rename intent extra following API review" into lmp-dev