Merge "Use a regular drawable as ConnectedDeviceDashboardActivity icon"