Merge "Reorder battery tips priority" into sc-dev