Merge "[MEP] Use switchToSub API with pending intent"