Merge "Remove the legacy smart battery tip from Settings" into udc-dev