Merge "Fix Battery optimization page broken"