Merge "Settings - add support for Launch by Default - part 2"