Merge "Fix Battery Saver location bugs."