Merge "Redirect battery-level settings preference clicks if needed" into sc-dev