Merge "Add a check to detect "duplicate app instances" bug"