Fix up content resolver in UserInterface

Change-Id: I6feffa36cc947252cf9357733c6720850cfb191a