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

Change-Id: I05e69ee914d5d35f002997043a44833d71de8aff