Merge "Fix "Nothing to be done" messages when launching soong_ui"