Settings: Make sure to rebuild on app entries loaded.

  Previously, notifydatasetchanged would only be called in oncreate,
  and any further callbacks from the application state session would
  be ignored. Now, make sure to handle the various scenarios and rebuild
  as necessary, notifying the ui as needed.

Change-Id: I61572ff082629046d1fdf5fedb1e8ec37343f588
TICKET: FEIJ-334
(cherry picked from commit 2794f4fe)