Make sure KeepGoingDrawer gets set correctly

Seems the exception is caught inside mw.loader.using so wasn't
surfacing

Change-Id: I7ca9d27ed7fb24cd08e4ef43da68595f87d4d21f
Merge "Make sure KeepGoingDrawer gets set correctly"