Merge "Adding new Battery Saver location mode."