Merge "Don't save UI executor in UiListener."
am: 8d3e0f2c0d

Change-Id: I69d423e692b75ba1fd1e5fc83c5f4c41b01ad846