Merge "Fix ANR issue in CallsManager"