Merge "Update battery settings page loading text" into 24D1-dev