Source selector: Remove unnecessary checks

* Removes a couple of unnecessary checks in favor of something simpler.

Change-Id: If7dd3aa48c7b289d8bd7ecb1b61f9bec6f29fc18
Merge "Source selector: Remove unnecessary checks"