Merge "Fix the device summary shown twice issue"