Merge "Fixed deadlock in IccSmsInterfaceManager"