Merge "Don't save UI executor in UiListener."