Allow apps to be selected in umbrella projects

Closes #1731
Closes #1730