Fix up content resolver in UserInterface

Change-Id: I6feffa36cc947252cf9357733c6720850cfb191a
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7