Merge "Change the order of battery tips"