Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev