Merge "Add incompatible charging battery tip UI and card skeleton"