Merge "Clear shortcuts associated to an A11yActivity when the A11yActivity becomes A11yService with the same componentName" into main