Merge "s/thumbnail/icon in the browsing api." into lmp-dev