Fix widget loading and Loader leaks

Change-Id: I1b5a80383b3c56574598298683b4f88afe8121c0
5 files changed