Merge "Revert "Impl private space for extreme battery saver mode."" into main