Merge "Fix RTL layout of text in Battery history screen" into klp-dev