Merge "Remove deprecated addonmanager markers"