Merge "[SB] Invalidate battery drawable on shield change; dump more info." into udc-qpr-dev