Merge "Apply the correct style to Battery and Storage page" into sc-dev