Merge "Re-use existing app even for non-multi-instance apps" into main