Merge "Change ripple in battery pages"