Merge "Remove the clone app only when the parent app is removed" into main