Merge "For Auto, display battery status as that of a connected device." into nyc-dev