Correct user sensitive source adding

Add all sources of user sensitive to the liveData map, before adding
them as a source, to avoid potentially adding new ones. Also removed
unneded main posting (add and removeSource do that automatically now)

Test: manual
Fixes: 154621944
Change-Id: I2f546aeb3fc1b6d8bc7cc971fde9177065708183