Merge "Adjust future charge start time." into pi-dev