Merge "Add settings constants for battery tip"