Merge "Add dock defender battery tips" into tm-qpr-dev