Merge "stopleaks: Avoid leaking views in maps" into lmp-dev