Merge "Changed style in Device Management Dialog"