Merge "Add dock defender battery tips"