Merge "Support battery level reporting via Apple VSC (2/2)"