Merge changes I87c5ad3f,I09b32c8f

* changes:
  Fix 2 input issues.
  Clear calling id in dontOverrideDisplayInfo.