Convert handler creation on the main thread.
am: 9589ef63c9

Change-Id: Ia9b5dffaadcfa43bbc3ab74abc97a59ae8cfc400