Merge "Fix battery optimization display problems"